Merge "changes to the message router"