test d9efb53f-94cf-4829-8004-b7dcc2225e15 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote