DOCS-1251, DOCS-1244, and some of Rassi's comments for DOCS-1188