Forward port of issue #20157 to 2.2.5.