fix FS install
Merge branch 'develop'