Updated zebra (bug fix)
Merge branch '2.6/feature/plugins' into 2.6/integration