test 1c36a4e7-e256-4ca5-9e7f-fb80ceaecea8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote