Merge "Fix EventRelayerKafka IDEA errors"