DOCS-3050 manually apply 2.4 changes to 2.6