Refactoring of the message handling infrastructure
Merge branch 'master' into Saltiel
Refactoring of message handling Part 2: cleaning and commenting