Bump policy/models to 2.3.1-SNAPSHOT