fixes data filtering
Merge remote-tracking branch 'upstream/master' into timestamp_markers