test c13a8421-efd7-4b42-9d77-e4d3ac2c1b63 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote