Forward port of issue #21095 to 2.2.7.