Merge "Fix missing dependency injection"