merged lucas changes
Merge branch 'lburgazzoli-HFT-HCOLL-47'