Merge pull request #7015 from apache/delivery

Sync delivery to release210 for 21-rc3