Merge branch 'release/1.5.1' into develop
Fix mccabe
Update version
Merge branch 'release/1.5.2'