Issue #27587: Merge from 3.5