DOCS-1603, DOCS-3404 updates