added a filter
Merge branch 'hotfixes' into develop