Merge branch '6.4.x' into 6.5.x #8511

Job	Run time
Check Samples	11m 54s
Test Against Snapshots (21-ea, 21) / Test	8m 13s
Build (ubuntu-latest, 17) / Build	1m 24s
Test Against Snapshots (17, 17) / Test	8m 5s
Build (windows-latest, 17) / Build	5m 8s
Deploy Schema	0s
Deploy Artifacts	0s
Deploy Docs	0s
Perform Release	0s
Send Notification	6s
	34m 50s

Provide feedback