Merge branch 'release/8.21.0' #2269

Job	Run time
native / cancel-previous-run	5s
native / update	31s
gradle-wrapper / cancel-previous-run	6s
gradle-wrapper / update	4m 30s
	5m 12s

Provide feedback