test 1abb065a-4f92-44ec-bac8-8f94ae1e8784 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault