Merge branch 'jk/ref-filter-colors' into maint