Update changelog
Update config files
Merge branch 'release/1.5' into develop
Version bump