Changelog updated after last merge changes