Forward port of issue #21282 to 2.2.8.