Merge branch 'release2_v2.3.1' into release2