Initial batch of updates to fix DOC-794.