Fixes #29213: merged fix from 3.5.