test 93b723e8-ee15-4b0a-8994-0867a7a10233 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote