Prepare 2.2 release.
Use file-system to stat instead of filesystem.