Merge "Sonar fix: BatchDataView.java"