test ad7769c0-a6e4-4a63-8798-b4d43f5e64f6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault