Merge pull request #12051 from eileenmcnaughton/batch_fix