Yesterday
Merge from recycler_ammo_fix