Oliver/HFX-853 : Fix going in for Hotfix Oliver