Merge branch 'hotfix/0.9.1-h1' into develop