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