Merge change I581bed77

* changes:
  Add a memory barrier.