Using inject in master
Merge in all changes