Final 1.6 commit