Oliver/HFX-814: Commit changes for Hotfix Oliver