Merge change 5806 into donut

* changes:
  Use additional functions to collect more memory information data points.