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