Merge branch 'chore/changelogfix' into 'develop'