Merge "Perform a non strict matching of .dm files when computing the size"