Logger config, DefaultController tunne up
Merge into master