[HUNTB-307]