Merge branch 'hotfix/open-fix'