DOCS-1257: Enterprise fixes