Merge "Remove messageTypes.inc and replace it by a hook"