Merge branch 'ab/ref-filter-leakfix'