Merge "Replacing ItemInfoMatcher with predicate" into tm-dev