temporary fork from kafka to add enhancements