Merge branch 'hotfix/0.3.1'
add deployPrepare phase
Merge branch 'hotfix/0.3.2' into develop