Fix to the filters
Merge branch 'hotfix-2.3.9' into develop