Hotfix applied to branch