[HUNTB-308]