Fixed filestore
Bumped version 1.8
Merge branch 'release/1.8'