test 4659cc4f-7266-428b-8f73-5db79b826f72 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault