Initial 1.6.2.0 commit