Integrating new Messaging protocol
merging changes