test 8163fad8-73e8-49a6-a837-1ebabc58c538 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault