Forward port of issue #19581 to 2.2.3.