Merge branch 'tb/show-trailers-in-ref-filter'