Merge branch 'adaptive-filter'