Merge "Added new message type constants"