Merge branch 'aggregateinternal'