Pfbhlt

Inclusive PR including both 3385 and the HLT changes