8.0.2 based on r339409