Merge branch 'release/1.5.0' into develop
bug fixes

fixed account lock method returning wrong error
bug fixes
Merge branch 'release/1.5.1'