Merge pull request #12674 from tundebabzy/issue-12673-1

Batch List Shows Wrong Expired Status For Batches #12673