Merge pull request #6839 from yashodha/CRM-17302