Merge branch 'tp/ACE-group-id' into ibm_next_20_tmp
Merge branch 'tp/ACE-special-group' into ibm_next_20_tmp