Single file system.
Merge branch 'single-file-system' into stable