Forward port of issue #19629 to 2.2.5.