Client logging, and misc. logging
misc. logging cleanup
Merge origin/master