Synchronize with Zebus v1.2.0