Improving logs and messages.
commit b41ea575cd15a47dcbcab98fe7c212ce7c4d62dc
Merge remote-tracking branch 'tbc/master'