MARI-13 MARI-24 added support for edit member