[HUNTB-309]