Merge pull request #2691 from atif-shaikh/CRM-14259