Merge change 6918

* changes:
  Make the backup manager do nothing when backup is turned off.