test 2fbd0e26-d6aa-42f6-b994-ad1615098701 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote