Issue #27801: Merge from 3.5