Fix BI problems
Update BI, add free space sytem
Merge branch && fix conflicts