test 2ef33e60-5257-4709-bd85-fdfeeded60a3 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault