test ada06f9a-da50-4bf9-a6cb-ac9a723b28ba (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote