Refactoring filters, not using deferred object in filters, in progressing hang up due to toolkit definit loop bug
Merge from origin/master