Kafka build (23/37)

Kafka build