DOCS-685 incorporate ed and dan's comments