DOCS-987 many changes