Merge pull request #2236 from neilLasrado/upstream/develop

Has Batch No field should be freezed #2023