WIP commit of kafka changes.