ObjectGroup location should not use as Definition
version update for 2.1
Merge branch 'rc2.1.0'