5 Days Ago
merge from bee_occasional_fire_fix (what a bug)