Fixed some issues of adding group id - reported by QC
Merge remote-tracking branch 'origin/dev' into dev