Proper groupId set
Merge remote-tracking branch 'authorative/master'