Added setting to disable features in development