Merge "Sonar Fix - Expiring.java"