MARI-30 MARI-35 added support for add/edit group