test 820cc6a6-cebb-427f-85fd-5ef5df07ac1d (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote