Merge commit 'smcv/aggregateinternal' into aggregateinternal