test 1eef862e-295d-4852-9243-b6885d4cba51 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote