Merge pull request #3524 from atif-shaikh/CRM-14816