test 1d5e88d3-9fae-41ec-b5ee-9800aaddd53f (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote