Merge branch 'hotfix-2.3.4'
allow translation of option types
Merge branch 'release-2.4.0' into RistoNiinemets-master
Merge branch 'RistoNiinemets-master' into release-2.4.0
update changelog