merge the file system modification from reynoldxu