Initial 1.6.2 commit