test 118981e0-7b1d-48d7-9323-70f4f0ee5823 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault