test 0d2943fe-878c-410c-b0d6-1338eae7812f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote