KAFKA-17417: Backport KAFKA-15751 and KAFKA-15752 to 3.8 and 3.7#17102

chia7712 merged 2 commits intoapache:3.7apache/kafka:3.7from

FrankYang0529:KAFKA-17417-3.7FrankYang0529/kafka:KAFKA-17417-3.7Copy head branch name to clipboard