Initial 1.7.0.2 commit