test 06417655-6c3a-4a13-8acb-fe2b0272ca16 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote