Hotfix v4.0.25