test 3711245a-3277-4b61-b542-60de03eef24e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote