HFW combox unit fix
Merge branch 'master' into kimon-MiniCalibration