updates from commits to 1.2.0