Kafka build (33/37)

Kafka build