Yesterday
merge from fix_outbreak_death_icon -> main