Dependency update
Implement ContainerAwareTrait
Cleanup from inspector
Merge branch 'master' into search-tools