Merge "Readdir should extract file name from DATA column" into rvc-dev