Merge change 6440 into donut

* changes:
  Trigger backup of locale change.