[HUNTB-473] HUNTB-473