---temporarily remove time window averaging
Merge branch 'master' into wk_time_only