Kafka build (24/37)

Kafka build