Merge pull request #4690 from metalbear-co/up-auto-kafka