Fixes #29261: merged fix from 3.5.