test e4fa243b-a09a-4f59-b2e6-ecf760fc1d2d (rebased onto develop)



This is the same as gh-5942 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testDefault