Merge change 5994 into donut

* changes:
  Less logging in some places.  More in others.