[HUNTB-312]