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