Patch eval to deal with current wednesday groups setup
Merge branch 'staging'