Forward port of issue #20566 to 2.3.0.M4.
Comment From: snicoll
This was reverted as 20200311 isn't available at this time