Merge "Initial message bus implementation"