Made messenger work concurrently
Merge branch 'master' into Development
Added more cache events