test e3b0f8fc-b8e8-4716-b432-777ae0081633 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote