[HUNTB-319]