task #features_update: Minor fix
Merge branch 'features_update' into develop