test 9a58911b-bce0-4212-b9ce-3c1c66468d72 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote