test 866b8e5c-8946-4a6a-ab48-637d58f9747f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault