Adds nested EpochGroup support
Merge branch 'nested-epoch-groups'