Merge pull request #7624 from neilLasrado/eval-group

Code Refractor.