test 7143fdc0-8859-427e-97ed-d235e2806919 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote