Today
merge from main -> loaded_ammo_type_indicators