Merge branch 'master' into development
Removed unnecessary dependencies
Solved a problem in dependency injection extension name
Merge branch 'development'