Merge "Updating ItemInfoMatcher to work with java streams" into sc-dev