Merge "TableHandler.java: Fixed sonar issues"