-- CRM-12284
Merge pull request #360 from pradpnayak/CRM-12284

-- CRM-12284 Tested all the bug cases listed in CRM-12284. There is a new notice which I will post to the issue and assign back to Pradeep to fix.