Version info
Merge branch 'fix-2733' into release
Merge branch 'release' into upstream

Conflicts:
	main/res/values/strings_not_translatable.xml