Initial 1.7 commit