test 33ede5be-ec6a-4d66-ab1b-34b07f244463 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault