Merge branch 'merge-patch-changelog-back-into-master' into 'master'

Merge patch changelog back into master

/cc @dzaporozhets