Restored methods removed at merge in DiagramEditorStatefulClient