Temp workaround for DOCS-117