test 9a1682d7-bef1-4f8b-85c3-1bfd762a70ab (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote