DOCS-1025: prep for pre-2.4