Merge "Bug 3540: Implementation of FlowIds based on match data"