Merge branch 'dev' into spring-3.2