Merge "Fixing itemInfoMatcher not working for folders" into sc-v2-dev