toolkit migration and testing.
toolkit filters
Merge branch 'JIRA-GWEB-239'