DOC-976: finalizing changes.