Merge change Ib28d3a82

* changes:
  Don't over flush the code cache at startup time.