Forward port of issue #19901 to 2.2.5.