test edf3e521-bc0e-4d7f-b4ac-80ae568a8771 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote