01ecd7bcd1
Merge commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd' * commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd': Implement persistent enable/disable of the backup manager