test e52b7e29-8583-4ed7-aaf1-e33501be9ee3 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote