[SWANcom] Changes to Internal Discard Process