Apply June hotfix