bug fixes
Merge branch 'release/1.5.1' into develop