test 2566828b-c1ed-4d4c-a32f-7bfcbb3c76c6 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault