Merge branch 'hotfix/0.4.2'