merged Kafka fixes from swing_ui development branch