Today
merge from condition_bar_repair_fix