revert to 3.2.7, deployed our own version to avoid pom complications
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'