Issue #28319: Merge from 3.5