[HUNTB-314]