Fix issue with routing messages on the server
Merge remote-tracking branch 'origin/master'