test 353ec205-49a2-4db5-a5fc-f25b4ef2a043 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote