Merge pull request #4761 from atif-shaikh/CRM-15743