Adding feature toggle for #455