Issue #29220: Merged fixes from 3.6.