test 150f2a5d-e8ff-418d-922d-8183029fa2e2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault