Merge "Add MessageRouter configuration"