Oliver/HFX-908: TAMPA commits for Hotfix Oliver

A Tampa duplicate for Pull Request #1199 . 
The changes in #1199 require the changes made in #1062 so I have included those changes here as well.