Merge change 7598 into donut

* changes:
  DO NOT MERGE - Disable settings backup in Donut