without zookeeper
With zookeeper
Merge remote-tracking branch 'ta/master'