correct log message.
Merge remote-tracking branch 'tc/master'.
format code