test 08e2d462-aadd-4cb1-941b-b3bfe80fe3a0 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote