Merge change 6426 into donut

* changes:
  Remove a lot of debug-log verbosity