Heri | #3643 | Handling duplicated delivery report
Heri | #NA | Updating test according to the handle of duplicate delivery report