Merge branch 'time-series' into bdale-ui3