CRM-9394
CRM-9394
CRM-9394
--fixed for CRM-12148 and fixed formatting
CRM-12147
CRM-12147
Merge pull request #186 from dlobo/CRM-12147

CRM-12147
Merge pull request #187 from pradpnayak/CRM-12148

--fixed for CRM-12148 and fixed formatting
Merge pull request #189 from yashodha/issue-9394

Issue 9394