3 Days Ago
merge from condition_bar_repair_fix