test 604ab84a-0571-40fe-9c7c-0b8a0bc57ea7 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote