Merge "Replace field injection with constructor  injection." into main