Merge "Implement per-field matching of ScanRecord." into sc-dev