Merge "Add message_body column to raw table." into nyc-dev