Merge "Fix broken MessagingStyle" into nyc-dev