Merge branch 'ot/ref-filter-cleanup'