Merged hotfix