#6639: Make changes to assign taxonomy to support batch.