Bump to v2.3.1
Merge branch 'release/2.3.1' into dev