Merge branch 'hotfix/0.3.5'
Merge branch 'hotfix/0.3.6' into develop