Forward port of issue #19552 to 2.2.3.