HLT config update for PR 3211

HLT config fixes needed for PR #3211 - requires PR #3211.