Merge commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1' * commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1': BackupManager wrapper class improvements
Merge commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1' * commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1': BackupManager wrapper class improvements