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