Merge pull request #6538 from vieiro/feature/master-to-cnd-2023-10-05

[cnd] merge master into cnd for JDK21-ga builds