Merge branch 'hotfix/2.3.1'
bumped version to 2.3.1
Merge branch 'version2.3.1' into develop