fix circular imports
Merge branch 'stats-rep' into stats-stage