Fixes #29308: Merged fix from 3.5.