Merge with 3.3 for Issue #19286.