#23142 hotfix