test 782335e9-80ba-4979-b659-0f24b84753eb (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote