Merge change 6326 into donut

* changes:
  BackupManager wrapper class improvements