Merge "Move ScanResultMatchInfo to its own class" into oc-dr1-dev