Issue #27431: Merge from 3.5