DOCS-1416 additional corrections