Merge pull request #4506 from yashodha/CRM-15475