Merge branch 'hotfix/0.2.2'
soft deletes
changelog update
Merge branch 'hotfix/0.2.3' into develop