test e69aa4e5-0adb-4ad7-b630-8f89e4221589 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote