Yes, I'm rebased on current master, I will compare with test_timeseries_legacy and remote double tests