merging messaging server with service-core