Issue #23116: Merge from 3.5