Applied KAFKA-1501 patch