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