Initial 1.7 commit (work in progress)