Merge "Sonar Fix: Pending.java"