Merge "Move flow comparison methods into utility class"