Merge with 3.2 for Issue #19286.