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