beta removed
IBG / FSFE added
Merge branch 'dev'