Merge pull request #3679 from yashodha/CRM-14951