test cabbef88-d4ae-4ad5-b6a2-3dc5bb31278e (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote