test 3ebaef0d-4c1d-4eb7-b69a-92841fff6ff5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote