test 0d1c4e3d-b0b7-442f-835c-6760d72d570f (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote