Merge pull request #4950 from atif-shaikh/CRM-15826