Merge "Sonar fix: Role.java"