Merge pull request #8206 from yashodha/fix.CRM-17893