Issue #16015: Merge and update from 3.2.