Merge "Add filtering and aggregate stats to log" into sc-dev