Merge change 9114 into donut

* changes:
  Add state saving mechanism to support proc restart