Merge branch 'hotfix/v0.4.1' into develop