Merge branch 'hotfix/filter_bug'