Oliver/HFX-829 : Fixes for Hotfix Oliver