Merge "Move towards a formal public API for backup and restore"