Pushed to v1.2 for release