DOCS-1948 Dan's feedback