Issue #20265: Merge with 3.3