Merge branch 'update-changelog' into 'develop'