Merge Master ChangeLog

Convenience update from the merged release branch to keep the ChangeLog of the `dev` branch sync.