Forward port of issue #20135 to 2.2.5.