Merge pull request #35945 from s-aga-r/BATCH-DISABLE-FILTER

fix: add filter for disabled batch