DOCS-1377 edits incorporating hannes' comments