Issue #27190: Merge from 3.5