Minor change
Inject components
Merge branch 'develop'