test d7191ae2-6a17-4c32-8b78-ab1427c85e46 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote