KAFKA-1501 patch adjust