Merge "prop=duplicatefiles does not show duplicates under same name"