Issue #23943: Restore extra fixes lost in merge 4fb2075952a4
1 file changed