test d9aa5566-72f4-4c27-88fe-ed9c3aff1308 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote