test 6ffdd215-1eb7-4d5f-b008-e94c931d1722 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote