test 885623fc-2465-4013-b6d2-e03ab5348470 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault