Team, Issue KAFKA-7382 <https://issues.apache.org/jira/browse/KAFKA-7382> has been fixed. Please review and merge. We need this fix in one of our production clusters.
Pull request is here <https://github.com/apache/kafka/pull/5665>. -- *Suman* *OlaCabs*