implemented M2 changes for Repost and Discard receivers.