Kafka build (25/37)

Kafka build