DOCS-1360 address @tychoish comments