test 54cdba88-b380-4cd7-9990-e8c9ac3ef22b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault