Forward port of issue #20719 to 2.3.0.M4.