Align with additional fix for DOCS-85