cleanup
Merge remote-tracking branch 'core-logger/master'