Merge "Sonar Fix: NS.java"