Issue #27518: Merge from 3.5