Merge branch 'hotfix/1255'

Close #1255
[2.3.1] bumped release version
Merge branch 'releases/2.3.1'

2.3.1 release readiness
Merge branch 'releases/2.3.1' into develop

2.3.1 release readiness

Conflicts:
	docs/languages/en/conf.py
Version bump: 2.3.2dev
Merge branch 'version/bump' into develop

Conflicts:
	docs/languages/en/conf.py