Merge branch 'feature_rolling_stats'