CBI-7 - Fixed service dependency injection