(cherry picked from commit 914591c9ae)
914591c9ae
One step towards fixing #17374 as most experimental APIs we use are now part of the stable 1.4.0.