Big change to message routing engine.
Merge remote-tracking branch 'origin/master'