Merge pull request #2904 from atif-shaikh/CRM-14277