Merge "Full local backup infrastructure"