test 9bb25387-ed12-494e-bb1a-a5c70f59d9e5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote