test a85d859d-5dcb-4d5c-b11c-286ea8638c86 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote