Merge #27782 fix from 3.5