Missing generator aggregator (OMS-237)
Merge branch 'oms-237'