Oliver/HFX-908: TAMPA commits for Hotfix Oliver

A Tampa duplicate for Pull Request #1199 which fixes SCTX-1334.
The changes in #1199 require the changes made in #1062.