Merge "Sonar Fix: Mgmt.java"