Forward port of issue #19976 to 2.3.0.M2.