Merge branch 'don't_expand_filters' into timeline-3.1.1_fixes