Added file-system provider.
Merged from main.