Merge "Resolve FUSE and lower FS cache inconsistencies"