DSKCLI-353 Avoid to get extra features