Merge "Cred.java - Sonar fixes"