LSC
remove old fb file
LSC fixes
unnecessary gap
Merge remote-tracking branch 'upstream/master'