Merge "BUG-4034: Missing barrier after flow remove"