DOCS-2086 2.4 specific changes