Add file system to context
Merge branch 'master' into lean_master