initial work on KAFKA-559