test 18974f59-3feb-4a28-b905-843ac9ed4e22 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote