Final 1.5.2 commit