Merge branch 'hotfix/v0.4.4'
Merge branch 'master' into develop