Issue #28045: Merge from 3.5