Fixed issue with record retention, retirement, and suppression