Final 1.4 commit