Merge branch 'fix/changelog' into 'develop'