Merge pull request #7082 from yashodha/fixCRM-17461