DOCS-1377 incorporating comments