Merge pull request #7054 from yashodha/fix.CRM-16990