test 71c127e1-506e-467c-ab61-79bd87d78ae8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote