Update aggregator to contain all modules
Merge origin/master