Dependency update
Implement ContainerAwareTrait
Cleanup from inspector
Merge branch 'master' into multi-editors
Update to latest master changes