Merge "Sonar fix: Mgmt.java"