Merge "Adds support for MessagingStyle" into nyc-dev