Hotfix merge