DOCS-3321 - more of the same