#23142 fixes