Merge "Sonar Fix: Perm.java"