Closes #1994
Updated Version 3.1.23
Merge branch 'master' into develop

Conflicts:
	version.txt
Fixes
Merge branch 'master' into hotfix
Updated Version 3.1.24
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-sa