Merge "Sonar fix for DB.java"