Merge "[Test week] unit tests for ItemInfoMatcher" into main