Minor commit post KAFKA-765