[Lull/HFX-1195]