Issue #20766: Merge with 3.5.