Comitted changes from zimbra8