Fixed the unit tests and changed ops->zu
Merge branch '2.5.x' into 2.5.x-demo