4 Hours Ago
merge from bbb_entkill_fix