Today
merge from fix_ammo_count_not_updating -> main