Merge branch 'tb/ref-filter-empty-modifier'