Version 1.5.0
Merge branch 'release_1.5.0' into release
Merge branch 'release' into dev