removed rawdata from timeseries as probably not needed
Merge origin/master