[HUNTB-310]