merge latest fs.c