[TASK] Make templavoila working for 6.2 (current only 6.2)