2.1
Merge branch 'release/2.1' into develop
revert versions to LATEST-SNAPSHOT