Merge pull request #24025 from demeritcowboy/batch-remove-2