updated description
Merge branch 'feature-addons' into development