Merge branch 'link-filter-26' into next