1.0.6 branch