Graft a89d654adaa2 from 3.2 branch. Fixes #15620.