Forward port of issue #19491 to 2.2.3.