Fix some timing problems around handling of mm-group._type
Fix some timing problems around handling of mm-group._type

shuwen/strand,shuwen/strand,sassomedia/strand,sassomedia/strand,dlasky/strand,dlasky/strand