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