Merge pull request #2952 from apache/delivery

Sync release124 with delivery for 12.4 rc4