Fix for DOCS-135