Porting 5_3_X HI reco updates to 7_2_X

The HI RECO updates that were previously implemented in 5_3_X are re-implemented in 7_2_X.

unless it's really temporary for some reason, please remove, instead of commenting out