Initial 1.6 commit