Issue #20609: Merge with 3.3.
2 files changed