Merge "Document 2.3.5, and 2nd half of 3.2"