test d73d4b4f-d2b3-47e8-8019-b971141405f2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote