test e33d9f5d-d568-4810-8a78-9c76b3bab1b4 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote