Handle group/ungroup
Add comments
Merge branch 'michel_2076_new_type' into next