Merge change 6725

* changes:
  do not merge - add a big flag to turn off backup