Merge change 6043 into donut

* changes:
  System and Secure settings backup.