Merge remote-tracking branch 'xmikos/master'
Centralize the add conversation logging