test e5a28d93-e041-4e0e-b051-05d8483a97e7 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault