Issue #27740: Merge from 3.5