remerge 2.0.3 Changelog