Oliver/HFX-771: Commits for Hotfix Oliver

I had to include @vbmithr commit for @johnelse's commit to merge.