Merge "Fixed Sonar issues in Main.java"