moved messages out of the datastore
Merge remote-tracking branch 'origin/master'