Merge branch 'hotfix/open-fix' into develop