fix circular import
Merge branch 'stats-rep' into s2