(BugID: 98695) SWM: Sending by registration date broken
Merge branch 'bugid-98695' into dev