remerge 1.2.0 Changelog