Issue #28303: Merge from 3.5