Fix inconsistent path of sfs folder when running in local mode..
Merge remote-tracking branch 'origin/master'