test dad857da-73d5-43ae-9d2f-0893330e1cc9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault