[HUNTB-582]