test 6e1cd5e1-00c2-4783-a77f-96e250433fc7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault