Oliver/HFX-771: TAMPA commits for Hotfix Oliver

Fix bug: SCTX-1299