Changelog update for recent merges