test d6d0ff14-e34f-4f79-a40e-48c6ecdc47b6 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote