test 0404ae2e-83fc-4ff8-8057-efeee638a6db (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote