Issue #28348: Merge from 3.5