Merge pull request #5040 from atif-shaikh/CRM-15835