Merge branch 'al/ref-filter-merged-and-no-merged'