Little cleanup on the Summary Statistics rewrite
Merge remote-tracking branch 'gitlab/etriks-1.2' into research