Merge "Fix sonar issues in Aggregate"