FileStorage improvement
Merge pull request #789 from delving/13.01-fileStorage-improvement

FileStorage improvement