Merge with Hotfix2