Partial merge of the docs