DOCS-1131 incorporate code review comments