sprint 1.5.0 changes
Merge branch 'release/1.5.0' into develop