Merge branch 'hotfix/Fix1'