Merge change 22883 into donut

* changes:
  Various tweaks to try to improve low memory behavior.