Issue #27349: Merge from 3.5