Merge "Fix sonar issues in Batch.java"