Merge change 8035

* changes:
  Prevent stale data exception.