[2.3.x] + switch branch to 2.3.12-SNAPSHOT