Merge "Improve flow collection"