Cherry pick KAFKA-14639#13652

dajac merged 1 commit into

apache:3.4apache/kafka:3.4from

philipnee:cherry-pick-KAFKA-14639philipnee/kafka:cherry-pick-KAFKA-14639Copy head branch name to clipboard