Added settings for default group and org.
Merge branch 'test' into dev