Merge branch 'el10' of github.com:terrapkg/packages into el10

Merge branch 'el10' of github.com:terrapkg/packages into el10 #15297