autowire constructor by type, then name
Merge remote-tracking branch 'origin/master'