Forward port of issue #21596 to 2.2.8.