Merge branch 'feature/dagger_injections'