Merge pull request #3983 from ossinkine/master

Update BaseInputFilter
Merge branch 'hotfix/3983'

Close #3983