Extend barrel life

PreSpring Issue 2024