Align with latest changes for DOCS-121