Changelog update for previous merges