Use hybrid management mode by default
Fix logging verbosity
Merge remote-tracking branch 'remotes/upstream/master'