Merge "Removed getClass comparison if FlowComparator."