Merge "Constrain group names to 40 chars on the editor"