Merge branch 'hotfix-0.4.1' into develop