Merge pull request #3281 from apache/delivery

Merge delivery into release126 for 12.6-rc2