Closes #14436: merged fix from 3.2.