Merge branch 'filtering_bug_fixes'
minor typo fix
Merge branch 'fix_typo' into development