test d0a6909a-6fd2-4da9-ac35-a95b30ec8ce9 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote