Issue #27381: Merge from 3.5