Edit fields dev 4 4

Same as gh-1746 and with an extra commit from 61885ca from gh-1753


Do not allow to edit the system group

--rebased-from #1746