Issue #19076: Merge with 3.4.