Merge "Add FlowMessage serializer"