HCFREAK-2674

HCFREAK-2674