Merge branch 'changelog-update' into 'develop'