GCP-6982 added handling for edit list