Added a parameter to prevent features
Merge branch 'Page-Feature-'
reactivate some things