Merge branch 'jk/ref-filter-flags-cleanup'