Merge "Sonar Fix: ApprovalDAO.java"