Merge "Fix MessagingStyle HUNs" into nyc-dev