Partial fix for DOCS-187