Updating to version 2.3.1.
Merge branch 'release/v2.3.1' into develop