Patches
Plain Diff
Also added a check for misplaced groupOfNames, as this is what is used for groups in core. issue #2895