Merge "DBMap.java - Sonar Fix"