test 54925d5a-9061-4ee5-a01d-c3341856068b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote