test d725a676-71a4-49a7-910d-fbd19a4bfbba (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault