Forward port of issue #20386 to 2.3.0.M3.
Comment From: wilkinsona
Closed by 899efc9ebaadecc7d7671dde5adb223f5ea2f841.