Issue #20753: Merge with 3.4.