Today
merge from hbhf_power_fix