[HUNTB-311]