Merge "Changelog updates for recent commits" into integration