Merge "Sonar fix: EventProcessor.java"