8.0.8 based on r349610