Use 'not' for handling empty messages
Merge remote-tracking branch 'origin/bugfixes'