Merged add support for long file names from Daid