Forward port of issue #19540 to 2.2.3.