test c2505d82-6bd3-4ce6-9bc1-7226eafdb4c2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault