Issue #17728: Merge with 3.3.