Merge pull request #1 from apache/master

Merge EE 10 changes into main branch