test 78b299ea-92bf-4b44-a21e-503861b09a47 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote