Merge "Fixed EIC grouping"