Merge "Properly append META_DATA event on flush"