Merge branch 'release/8.18.0' #2168

Job	Run time
gradle-wrapper / cancel-previous-run	5s
native / cancel-previous-run	5s
gradle-wrapper / update	19s
native / update	37s
	1m 6s

Provide feedback