task #features_update: Features update
Merge branch 'features_update' into develop