Issue #19588: Merge with 3.3