KARAF-2961: use flag to activate feature