test 68849abd-a6fd-4ba1-90ae-460e5c93b6dc (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote