Forward port of issue #19707 to 2.2.5.