Merge branch 'hotfix/0.5.2'
Merge branch 'develop'
Merge branch 'develop'
add: -conf
Merge branch 'hotfix/v0.5.2' into develop