[prep-release-3.1.0] Update changelog with final changes
Merge branch 'prep-release-3.1.0' into develop-ascraeus