Merge pull request #21215 from vishdha/batch_message_v13

fix(UX): batch error message improved