Merge "Sonar fix: ListUsers.java"