Merge "Sonar Fix - Key.java"