Merge pull request #1208 from pradpnayak/CRM-13060

--fixed for CRM-13060