manually apply DOCS-3081 to 2.4