ObjectGroup location should not use as Definition
Merge branch 'master' into rc2.1.0