Merge branch '6.5.x' #8531

Job	Run time
Build (ubuntu-latest, 17) / Build	12m 38s
Build (windows-latest, 17) / Build	19m 22s
Test Against Snapshots (21-ea, 21) / Test	10m 0s
Test Against Snapshots (17, 17) / Test	10m 47s
Deploy Artifacts / Deploy Artifacts	2m 1s
Deploy Docs / Deploy Docs	1m 26s
Deploy Schema / Deploy Schema	58s
Send Notification	6s
Perform Release / Perform Release	-1s
	57m 17s

Provide feedback