Merge "Sonar Fix: ConfigDAO.java"