Issue #20460: Merge with 3.3