test 1a793934-b656-4a9d-a046-a3932e0a3e7c (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote