Sync hcoop-backup changes from megacz