Merge pull request #4709 from metalbear-co/skreborn/kafka-oversized-hang