Merge change 7140 into donut

* changes:
  Add more logging to track down a monkey bug