Merge branch 'chore/fix-changelog' into 'develop'