test b54fb22e-5ecc-4804-ba1c-49c7b1655a3f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote