Merge "Update batteryDiffEntry filter condiction" into sc-dev