Merge "Updating the Kafka listener compliance to could events and legacy"