merging from branch 3.2.0-SNAPSHOT