1.2 dev branch final commit