Fixed #27251: merged fix from 3.5.