Upgrade Features
Fix supp info
Merge branch 'dev'