Merge change 7671

* changes:
  Free memory on low memory condition.