Pfbhlt

Trying again: this PR includes #3385, fixes HLT merge problems, and applies cleanly to 71X.