Updated feature toggle handling