Ajay/DC | #2978 | Handled delete scenario