Issue #28944: Merge from 3.5