test 5a397b79-edd7-4d6d-ad58-f77f31815a0e (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote