merged 1.0.69 into head