Fixing featuresOnly logic
Merge branch 'develop'