Merge branch 'hotfix/issue42' into develop