Oliver/HFX-829 : TAMPA fixes for Hotfix Oliver

Fixes SCTX-1218 and XOP-364