DOCS-987 ongoing