Merge pull request #4726 from atif-shaikh/CRM-5039