[HUNTB-316]