Debug log fixes. Some parts of the messages were not displayed.
Merge remote-tracking branch 'origin/master'