Forward port of issue #19972 to 2.2.7.