Issue #28203: Merge from 3.5