test ecf588cb-4380-4877-9d4d-42d3d0a0a997 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote