Merge branch 'release/0.5.7' into develop
Minor fix
Merge branch 'develop'