clean up sampling timeline
Merge branch 'master' into cleanup