Issue #21718: Merge from 3.5