FL-713: move hardened flavor to mix-in