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