Merge "Add conversationId field to Message"