DOCS-3020 Dan's feedback