Update with latest FS sdk
Fix bugs from FS sdk upgrade