test 74a1eebc-884b-4179-8ce1-cedc566dd864 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote