Oliver/HFX-818: TAMPA Commits for Hotfix Oliver