Merge "Fix disableGroup" into main