Merge "support message header collapsing"