Merge "Bug 3281 duplicate flow programming"