Merge branch 'release/1.5.0'
Merge branch 'master' into develop