autowire constructor by type only, keep it simple
Merge remote-tracking branch 'origin/master'