1.5.2 version
Merge branch 'release/1.5.2' into develop