Autowire features (can be edited, but not used for now)
Merge remote-tracking branch 'origin/master'