DOC-1396: all edits for this ticket.