test ce750f69-e6ca-4303-bca8-546681da2bbe (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote