Merge branch 'release/1.83.0'

Conflicts:
	version.txt