Resolves https://github.com/spring-projects/spring-kafka/issues/1499 **I will do the backports because I expect many conflicts.**
Resolves https://github.com/spring-projects/spring-kafka/issues/1499 **I will do the backports because I expect many conflicts.**