Merge pull request #3025 from sbktechnology/v4.x.x

some fix in batch related cleanup