Issue #28455: Merge from 3.5